merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 14 Apr 2009 05:04:58 +0000 (14:04 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 14 Apr 2009 05:04:58 +0000 (14:04 +0900)

Trivial merge